hotfixing issues #141 & 142