Changed to safer way