Quick fix #42