re-fix #1 for spa