#51 #50 Fix. The beginning