Partially fixed issue - first step. #7