Slightly clunky fix for #50