Quick fix #3