Fixed Issue core-firmware/issues/128
As Is
Fix Issue https://github.com/spark/core-firmware/issues/128