Safe points bug fixed;