Fixed issue due to change of buffer type.