Fixes #1 also prevents crashing ACT in 500 Error (hopefully)