Fix: previous fix wasn't complete. Commit a2848fec