Post submit bugfix