Needs update as in 1fed9834b35dbee8b329305b2a62ac1ddf8e0eb7 after #149 is merged. Alternatively, the function including the fix could be moved to all views.