worked on solving #234 && #293