fix for crashes?