- Added fix for the glitch