Another temp fix attempt, until I can do it correctly.