Issue #197 Better performance on Samsung devices.

This fixes performance issues on Samsung devices related to issue #197