Fixing previous commit to pass tests