fixed bugs created by marian