Hot fix #2