Fix Android bug and change :draw-count to :draw-time