Again fix for #24