Bug Fix and vanish fix