Fix for Jandal again