#193 - fix some issues after merge