Grrrr :( cc: @MichaelClewley @BlackBerryDev