iOS bug fix #20