Bug Fix CON-64