Fixed kirby ^_^