Fixed aziz/knockdown#15