Added: fixes