bug fixes from 1.3.x versions