Unfortunately this hack is still necessary on the develop branch