Added bug in merge caused by ion window manager