[#GAPPS-63: Fixing bug]