Fix issue LemonBoy/bar#25