Bug fix
Merge pull request #1 from sampo02/sampo02/work

Bug fix