Another extreme bug fix
:)