Temporary fix until I have time to fix it for real.