#469 fixed for 2.x