Minor bug fixing. Current version sent