Fixed #4 provided workaround for non yet implemented features