Little bit safer approach