Fixed #633
Fixed #634, Fixed #632
FIxed #635
Fixed #636