Workaround on application