Nicer #50 bug solution