#250 - solved some regression issues