Bug Fixed (files not correctly linked)