Fix/spm12