started addressing issues #359, #360