resolving #2738. For some reason, the order matters here. Didnt investigate further