potential crashe fixed