Fix for #245