Bug in shift fixed