Really hacky fix to #57