Fix #53 and test youtrack #EL-1 fixed