FIX: Crash in some cases