Small bug fixing