Last comit now works as intended