Ensured compatibility with new dev environment