Fixed special case code (...again)