Taking care of #276 and #278