Bug fix, minor update