Quick fix #2