Provides fix for #6