Fixed, FIXME on Switchcase