Fixed issue 3324

Ok and tested by Ruben