Removed ugly fixes