Fixed abstract mess.