Fixes #305 while keeping #277 intact