Fixed (both) (commit 0579b520925d4811d83656d62d507e7b94b8f588)