fixed #24 , the real fix was in last commit