Fixed bug in #2