Fix as @michaeljoseph suggested