Thanks to armando.dicianno for the patch Fixes issue #603 Change-Id: I91ec030e5674b82c05115ed4dfbdb8ccbff22b66