[#11] Fixed issues from comments under commit 2aa9da77ca37101b0fa5e627d3ac72f7772c1cf5