Fix for issue #260, shorter guard clause.