fixing the crash maybe?