Fixed bug (issue 30)