Small temporaray fix to stop crashing