sort-of fix for the droid modal issue #93