Fixed new OOP layout so it doesn't produce fatal error. Oops indeed