Fixed massive code