Issue #67 also for PROGRAM_SOURCES