Quick fix #6