/issues/216 - fixed more bugs