sf bugfix