Better behaviur
1.0.2