Fixed a minor bug, see master for details