Previous bugs resolved.