Fix for one submission