oooo i guess this is necessary for 0.8