temp solution to prevent app crash