fixes #222 - Fixed static references inside the file