Fixed bug, updated version