Movabletype (for #1353)

Just applying changes according to Juan's feedback. See #1353