Fix #526
preparing 5.5