fixed #1 with mentioned patch