Fix for #132, #135