Removed ugly temporary fix.