temp fix for crash-bug