fixed: Crash + cosmetics