Fix previous commit

Previous fix thrown an "Illegal invocation error"