#MP-1 fixed
closes #1