Hopefully fixed error at line 419