Fix for #154