Fix for 92348f9c70afb70624f2188a3a94741a6682da9f & #130