Fixed #43, should effectively work the same as before