Add FIXME saying this is a temporary fix. Need to think of long term solution.