Removed old dirty fix