Ported fix to managem programs