Fix for submit