Issue 275 pos support