Fix for #277 merge