[issue #353] [Fixed] fixes small bugs