Second quick and hopefully not so dirty fix