added compatibility with legacy dev/bug-models