Fixed bug #123