Yet-another fix... :(