fixed compliance with Oscar 0.6beta