Fixed bug ~