Bug somewhat fixed