fixed compilation after merging master