A temp fix for #113 and #153