fixed the bug that crashes the whole website