Fixed issue #38: Application crash on tap