Bugher #133 fixed