Fixing small bug, everything seems to work.