Fix for android only message
Giving credit where it's due