addressed issues #413, #414