FIX: attempt at fixing issues #251 and #252.