Spring Bug Fix