added little check