Quick fix #7