Why the ifdef? this shouldn't be needed