Reverted over the original guard style with @sandal suggestion