Fixed bug introduced with last commit (see #4)