Removed temporary fix