Fixed #413. Hope this works :)