Added needed hack