Improved trailing hash problem we had in #43