fixed #4 some