Fix to work with Djurdjevic