temp fix to crash bug, commented out code without really fixing issue