fixing to be more open-source-friendly