fixed #3 ticket