fixed #iOS-6 : cleanup