Slight bug is removed.