Fixed source compatibility