Default removal due to problems with inline saving