Fix PR1581, patch by Timo Savola